Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 17 Jan 2012 03:04:26 +0000 (19:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 17 Jan 2012 03:04:26 +0000 (19:04 -0800)

Trivial merge